10.2 move unit tests into folder
10.4 split unit tests into 2 files