Fixed tests to work with new subject class name.