Re-enable tests affected by #1321840

Uncomments tests that were failing due to the above bug

Change-Id: I0945fd50fd00c53808412bbc6a837dc153abef25
remove default=None for config options

In the cfg module default=None is set as the default value. It's not
necessary to set it again when defining config options.

Change-Id: Idc8e07b67c884c4c6e6632f7e31efd384353e34c
Closes-Bug: #1323975
Merge "Re-enable tests affected by #1321840"
Merge "remove default=None for config options"