Address review comments + add basic router tests