Trying a new module approach to testing.