dead code cleanup, test case extension