Modified some of the tests, only a few errors now. Will probably remove the majority of the tests in the end, since it is a bit overkill for what I am doing