Property switches tests complete, some refactoring