Fixed broken test case, added new test case.