Reviewed tests - needs more refactoring later
Merge pull request #6 from Steveo1485/refactor_tests

Reviewed tests - needs more refactoring later