Test and Routes Updated