Moved unit tests into a tests folder with a single test file
Split unit tests into 2 files