Move code around and remove Testing heading

Moved code that shouldn’t have been under the Testing heading to
appropriate spots. Deleted the Testing heading, since that’ll only
exist in another branch.