Merge "Updates to test env and A1function test"