Add more tests to address the PR comments