propertyfix tests: moved imports to top of file, as per code review