Move unit tests into a folder with single file
some FT styling