[3](Dan, Matt) fixed functional tests