Fix unused typedefs warnings and return type in one of the tests