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