improve tests environment