Move unit tests into a folder with single file
Creat FT for check list
Split out unit tests into two files