Slightly better test invocation mechanism