Minor cleanup of tests