Turned non test file into a module. Moved tests into separate test file.
Converting test file to sub-class Test