Fixed some functional tests