Refactored models
checkpoint
more tests for the db design