Tests and Routes updated