Add unit test suite
Modify to use Cake Pattern