added more Maker tests, and adjustments to make() function