Update non-functional tests
Update non-functional tests