Added a few more tests for code coverage.. evil I know.