...
Added tests
Simplified TypeParameterBuilder usage
Added tests