Fix a failing test. Add a FIXME