Revert "Illegal data classes now have only rawData field."

This reverts commit ed3d921cead214d8237abe4ecf85b72408f5ae3e.
Fixed bugs.
Renamed so we can distinguish it from actual test cases.
Fixed bugs.