GREEN acceptance test 3 and refactor