Fix tests and add defaults