Cleaning up class names
More ORM unit tests
Collection tests