Bugfix, remove complexity invoking tests by doing it in the same session.