Refactor Fit test, which still fails...