Fixed tests, now passing