Added handling of mixed routes with static and dynamic parts, updated tests