refactor

- place tests in their own module
- slightly simplify tests

Author: Byron