Upgrade test for issue #87 fix
Fix attempt for issue #81