Fix failed tests

Yes, actually I didn't move it yet but I will.