ups, merged test case...