Revert "a bit of refactoring for the future"

This reverts commit 5868f8814b05ed03112e1223628695e6397f4f2c.
unit test for default values