Merge "Tests to verify PICK and VIEW are handled." into klp-dev