Fixed RouterTests.cs from merge