Renamed module to reflect purpose
Switched tests to more logical order