Remove @current_admin and make all tests pass