Use pytest syntax to reduce boilerplate

* Replace assert methods with simple assert statements
Move testcase tests into testcases directory
Merge branch 'master' into refactor-tests
Merge branch 'master' into refactor-tests
Merge pull request #27 from incuna/refactor-tests

Refactor tests