Merged couple more changes from test-specific-db