Updated testing

Updated code and updated some of the tests. Removed some of the useless tests.
If these lines are not needed then they should be removed.