Fixing some minor things and getting 100% code coverage