adding environment and testrun group support