Fixed tests, all green now