Fix bug and add two more tests