Will work on the failing tests. Then will add some tests supporting the change.