Small Updates to SQLMaker and its Test