Add tests for JavaTypeSubstitutor, 2