More testing cleanup