fixed tests and defaults
fixed tests