Generated tests and corresponding bug fixes

Comprises support for symbolic names