Updated testing

Updated code and updated some of the tests. Removed some of the useless tests.