X out usecase tests to begin testing database
Merge fix
Merge fix