Fixed two missed unit tests that were explicitly checking the previous error messages
Simplification of theory parameter names, since format automatically deals with toString() and nulls.