trimmed even more fat - green test suite