Fixed broken tests (hopefully).