Completed hours of exercise support. Refactored tests some more since they suck so much.