cleanup of types in tests (use SqlType instead of strings)