Used namespace typedefs, fixed test compile issue.