rearranging the tests to they match the module and
broke out some utilites functions out of the instance