Add tests, fix properties