Made the tests more concise
Merge pull request #13 from quid/refactor-tests

Refactor Tests