Added more tests, part ii