Progress
It works!
Fixed tests