Further testing cleanup