updates for flexible functional testing