Added two more tests, along with comments