Sandesh | Re-structured and renamed functional tests