Fix verbed routes scenarios and include their tests