Move unit tests into a folder with single file
Split out unit tests into two files