additional testing cleanup