Update functional-tests for OS testing