Updating base adapter to not wrap function calls inside statements. Tests also added to confirm this functionality