Fix functional tests

Change-Id: I0b940a4268e84f777b9e6f9aaa477afafed361be
Merge "Fix functional tests"