Cleanup/tests

This is a property, the the rest of them