Re: A better calling interface for tests (and some bugfixes)