Cleaning up tests and classes
Started on DBO tests
Implemented entity
Rename test
Added Clause tests