Ashwin, tests added