Initial work on the 9560, fixed a failing test.