Add time test
Merge branch 'loop' into next

Merge in code for timing test with grade and backend