Fixes tests broken by Daniel
Merge pull request #59 from dbeckwith/fixTests

Fixes tests
Merge branch 'team9dev' into End_Estimation_Button