Minor testing cleanup