Fix unit tests for property support