Updated DSN builder
Updated tests