master: More tests.