Make fewer tests depend on default bucket type mechanism
Update message file for newer beefcake