Tweaks + Route Test Check