Nick O: Minor change to Routes file, adding tests. I'm deferring further changes until I'm happy with the overall design (i.e. allowing programmatic route definition)