Merge "Fix pixel test" into klp-dev