Continue fixing tests, start work on FEN