improved smoke-test