cleaned up property access with helper. Added tests.