Clean up and remove old tests