fixed tests and defaults