refactoring tests
Merge pull request #8 from cs27x/refactoring/walton_seymour/group1

refactoring tests
Sounds good
Alex's refactoring
Alex's refactoring 2