Fix assertion messages to match and pass tests