Fixed tests, hopefully