Update requirements
Add instructor and staff scopes
Refactor tests