Fix unused typedefs warnings
Fix test compilation error - invalid return type