Merge "Add Route Servlet and Log Servlet Tests"