removing route optimisation 2
Removing useless tests and test fixes
Fix for series with PEG grammar