Issue #15: update to use "expect" instead of return values