adding tests
cleaned up properties