updating tests for gh-756 changes