Merge "Clean up database cloning for tests."