Few test cleanups