clean up functional tests a bit