Green: refactored test(s)