Fix some classes that weren't being counted in our unit test numbers due to their .gcov files not getting generated.