[greg and andrew] restore functional test