fixed up functional tests