Fix broken tests. Everything passes