CORE-4446: added a some unit tests and modified ace.ebnf to match one of the oddball test files