cleanup testing code, again