Fixed all the tests because I am da best