Feature #64, refactored test and routes