Add default values to system properties
Put tests back