Knocking out some more tests to increase coverage