Renamed system properties to use underscores so they can be overridden as system properties
moved h2 back to test scope