Added some additional tests
100% test coverage!