Added missing functional tests