Get specs passing and clean up a little language in route specification specs