update tests for merged func