Redid the test methods

Basically took the methods Leo suggested on Canvas. Adjusted a few of
them.