Added more tests for bwcalc parser