Adapted Test to new environment