Remove tuple import, Use fromList in constructor, Remove granular exceptions, update testcases