* Fix bug #2921 Moving whether a range should be parsed further back, giving e.G. parsing of invocations precedence fixes the bug * Add test
* working for comparing filepath to string * added tests