Fixed broken tests. And started to break the .yml