Some fixes in bnfc-system-tests
Merge branch 'master' of github.com:BNFC/bnfc