Update acceptance test script and adapt tests accordingly