Added tests and recalibrated the parser to match operators priorities