Tests passing again