Added more properties and associated tests and fixed some other properties