Headway towards FMM, old tests still passing