Test case cleanup, removed unused C code