playing with ideas
Update tests with new behaviour and make it pass