tests: added "typehint" for driver name in reformat()
tests: more readable addWhere test
whitespace, used common (and verbose) indentation in switch statements