Add make and undo testing to the new test code

Rearranged some of the code to be better organized. Also removed
the current tests to restructure them for the new test code section.