fix tests and undo unrelated fix