Added "unit" group to tests
Added Router tests