Add more tests
Add properties