ACMAKER_dev: Added final accepted version

Also added testcases