Fixed some of the old tests, one left to fix. Not really sure what it's doing so that one is going to take me a little longer. Will commit when again it's fixed.