Fix all tests — hooray!