Fix 2 more unit test failures by annotating some methods as not a test b/c they have 'test' in the name.