Moved unit tests into a folder with a single file'