Tests

Fixup test suite