Add some more (less trivial) tests.