Rewrite itests using the ordinary test macro