Code clean up

ditched the string replacements, altered the token template so now all
requests need to be bounded by <info> tags, fixed tests to properly
deal with raw request format