Fix testing issues.
Fix sailthru library issues.