Add new test case, clean up old ones.