Refactor tests

* See issue #2
* Too much redundancy, makes it difficult to read & as a consequence
other to maintain