Cleaned up some DB calls in the integration tests