Added some tests
Code Coverage now at 89%