Fix forwarding mistake in implementation, add tests for perfect returns

2 jobs for master in 59 seconds (queued for 1 second)