Fixed some tests

I've fixed some of the failing tests. There are some that still don't work, but this will allow people to concentrate on the other tests.