Fixed tests (maybe)