test procedures rewritten