Functional testing fix