Fixed tests, all pass now