Simpler route handlers, unit tests ready for updates.