Tweaked to help with unit tests
Inital set of tests