TDD Cycle 4: Made it work if something non-nil is returned... This will
probably go away in the future