Move unit tests into a folder with single file-2