Merge "Remove tests that no longer make sense" into klp-modular-dev