Moved unit tests into a folder with single file