Fixed database setup method ordering