adds singleton maker and tests