Updating failing tests for #36