Clean up push test more