Sprint 2 - commit 5

Finished altering tests.