Modified parser rule regexes
Small test improvements
PEP8 fixes