Merge "pass codesniffer on tests/"