Fine tune test procedures