Refactoring spec for reduced chatter

Instead of relying on the somewhat less well known #tap method, yield
the instantiated object.