Merge "Updated function test env with new tests and features"