golint
Eliminate intermediate variable in tests