- Added testcases
	- Some fail and need to be fruther verified