Further cleanup of test code.