Add more test case for each function
Refine arch for  CMS detect

	1- Support CMS detect as module