Fix type error, test, fix test.