WIP -- More testing patterns, separate route into lone class; convert bare URIs into properties