get tests compiling - not green though..
fix property handling