Refactor Tests

Beautified the one unit test we had