Tests

I've uncommented and fixed a couple of the failing tests.