Merge testing branch into master and clean up.