add akshay joshi's tests pt1+2