More tests and fix for default values