More functional tests added