Added lots of tests for code coverage