Fixing up database test namespacing / including