Fixing Mvc\Router tests, enabling more tests