Added additional test case, refactored inline dynamic type builder target handlers.