first adjustments for toplevel tests