grade fix and admin test