Bump functions no longer return; fix tests