Refactor test to be closer to the Spoon API.