Adjusted tests to changed defaults