Tidy up database utility methods
Use more of a fluent interface for these tests