Tests weren't working so I fixed them, and added test cases/code

[philip-peterson]

• Apparently expresso added another argument to each callback, so I went ahead and added those in.
• I noticed 'walrus' was missing from the codebase, so I added that and its preferred plural ('walrus') to the code.