Updating failing tests for #36

Failing tests for issue #36