Fine tune test env