switch from Field to Property access
more
fix tests
minor