Merge "Temporarily removing a few tests" into klp-dev