add tests to cover more scenarios
add converalls