Tests, tests, tests

Trying out ways to implement sensible module structure