Added two more tests