More checks added, all tests pass