shashank | adding functional tests