Merge "Updated function test environment"