further property work and test fixes