Add two more tests for chasing bugs