EXtends parsing and unit test scope.