Make module structure consistent

There are a few small things out of place with our module structure. For example, some test files have an enclosing `describe` while others do not.