Revamped test cases.