Tests

More tests.