Some testing cleanup