tests: increased compatibility with the new style test