Fix tests and defaults. All tests now pass and test as expected.