more tests
dont treat properties special
more cleanup