sort makes
removed unnecessary imports
added tests for included makes section