Various database/test changes