Work on Database Unit Tests