Test cleanup.. getting there.
Cleaning...