Fix some stuff, but 1 of your tests still fail.