Updated routes. Fixed tests so that they pass with Python 3.2.