Fix red tests
Slight refactor