Fixed some tests (running fine at least locally)