Moving tests into a module
Spliting up tests