Fixed tests, all pass