#130 - Fixing broken specs and routes