Fixed Tests

Test fixes here. I've run the test suite on my pc this time...