Fixed tests, they all pass