Updated testing

Updated code and updated some of the tests. Removed some of the useless tests.
Unless it doesn't because something broke it.  That's why tests exist.