Added some more tests to increase some coverage.