Minor cleanup for unittest: