Missing tests and typo fixes for #4501
rebased onto 4f81f77848c9768bd831ef38b2d98590abe263f3
Cool, thanks! :)
Pull-Request has been merged by pingou
Missing tests and typo fixes for #4501