Fixed up unit tests, appears there is a problem with Properties