added properties
added basic tests