Rearrange unit test files
Fixed typo
Merge pull request #2 from acfatah/master

Rearrange unit test files