Comment out tests due to additional refactoring gofmt is doing