Add a few more tests for special cases