Tests

Improve a couple of the tests