Added a few tests and removed unnecessary code to get code coverage up