moves back to underscores
adds ring-mock, starts testing routes