Sorry, I might be using you to experiment with github! ;)

Anyway, added in a missing 'return' from previous merge. 

Also added a bit of a pedantic bugfix to the test project because I kept pressing backspace more times than required.