Updated testing

Updated code and updated some of the tests. Removed some of the useless tests.
They were commented out so that others could take a look and be sure. They should be removed if they are not, but wanted to make sure.