Code style
Added router test