Corrected unit tests, discovered additional issue with property accessor in tests