Got rid of some cruft in the various files and updated the Wrath test

Created a list of tests that are missing and should be implemented.