Still one failing test, but things are improving