some functional tests added