diff --git a/src/main/java/avatartranslator/AvatarConstant.java b/src/main/java/avatartranslator/AvatarConstant.java
index 03a1710cccf0ad5399c90b7ad2f5ae1ec46ec3ff..04f9b617cadf1b054a133c65932e942cebdb36ff 100644
--- a/src/main/java/avatartranslator/AvatarConstant.java
+++ b/src/main/java/avatartranslator/AvatarConstant.java
@@ -52,11 +52,11 @@ public class AvatarConstant extends AvatarTerm {
     public static final AvatarConstant FALSE = new AvatarConstant ("false", null);
 
     public boolean isLeftHand (){
-	return false;
+    	return false;
     }
 
     public AvatarConstant (String _name, Object _referenceObject) {
-        super (_name, _referenceObject);
+        super(_name, _referenceObject);
     }
 
     @Override
diff --git a/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java b/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
index 69f7e84ff54d3690958c59ed98f0e907286cb15e..a7fe2826d95a5556794896321ae7456c35fd0ede 100644
--- a/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
+++ b/ttool/src/test/java/ui/tmlad/TestTMLADComponentsDisabling.java
@@ -160,103 +160,6 @@ public class TestTMLADComponentsDisabling extends AbstractUITest {
         assertFalse( stopElement.canBeDisabled() );
 	}
 	
-//	@Test
-//    public void testDisableTGConnectorTMLADWithChoice() {
-//        final TGComponent startElement = new TMLADStartState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-//        diagramPanel.addComponent( startElement, startElement.getX(), startElement.getY(), false, true );
-//
-//        final TGComponent requestElement = new TMLADSendRequest( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-//        diagramPanel.addComponent( requestElement, requestElement.getX(), requestElement.getY(), false, true );
-//
-//        final TGComponent con1 = new TGConnectorTMLAD( 	0, 
-//        												0,
-//        												diagramPanel.getMinX(),
-//        												diagramPanel.getMaxX(),
-//        												diagramPanel.getMinY(),
-//        												diagramPanel.getMaxY(),
-//        												false,
-//        												null,
-//        												diagramPanel,
-//        												startElement.getTGConnectingPointAtIndex( 0 ),
-//        												requestElement.getTGConnectingPointAtIndex( 0 ),
-//        												new Vector<Point>() );
-//        diagramPanel.addComponent( con1, con1.getX(), con1.getY(), false, true );
-//
-//        final TGComponent actionElement = new TMLADActionState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-//        diagramPanel.addComponent( actionElement, actionElement.getX(), actionElement.getY(), false, true );
-//        
-//        final TGComponent con2 = new TGConnectorTMLAD( 	0, 
-//														0,
-//														diagramPanel.getMinX(),
-//														diagramPanel.getMaxX(),
-//														diagramPanel.getMinY(),
-//														diagramPanel.getMaxY(),
-//														false,
-//														null,
-//														diagramPanel,
-//														requestElement.getTGConnectingPointAtIndex( 1 ),
-//														actionElement.getTGConnectingPointAtIndex( 0 ),
-//														new Vector<Point>() );
-//        diagramPanel.addComponent( con2, con2.getX(), con2.getY(), false, true );
-//
-//        final TGComponent stopElement = new TMLADStopState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );
-//        diagramPanel.addComponent( stopElement, stopElement.getX(), stopElement.getY(), false, true );
-//        
-//        final TGComponent con3 = new TGConnectorTMLAD( 	0, 
-//														0,
-//														diagramPanel.getMinX(),
-//														diagramPanel.getMaxX(),
-//														diagramPanel.getMinY(),
-//														diagramPanel.getMaxY(),
-//														false,
-//														null,
-//														diagramPanel,
-//														actionElement.getTGConnectingPointAtIndex( 1 ),
-//														stopElement.getTGConnectingPointAtIndex( 0 ),
-//														new Vector<Point>() );
-//        diagramPanel.addComponent( con3, con3.getX(), con3.getY(), false, true );
-//        
-//        assertTrue( con1.canBeDisabled() );
-//        assertTrue( con2.canBeDisabled() );
-//        assertFalse( con3.canBeDisabled() );
-//        
-//        con1.setEnabled( false );
-//        assertTrue( startElement.isEnabled() );
-//        assertTrue( con1.isEnabled() );
-//        assertFalse( requestElement.isEnabled() );
-//        assertTrue( con2.isEnabled() );
-//        assertFalse( actionElement.isEnabled() );
-//        assertTrue( con3.isEnabled() );
-//        assertTrue( stopElement.isEnabled() );
-//        
-//        con1.setEnabled( true );
-//        assertTrue( startElement.isEnabled() );
-//        assertTrue( con1.isEnabled() );
-//        assertTrue( requestElement.isEnabled() );
-//        assertTrue( con2.isEnabled() );
-//        assertTrue( actionElement.isEnabled() );
-//        assertTrue( con3.isEnabled() );
-//        assertTrue( stopElement.isEnabled() );
-//        
-//        con2.setEnabled( false );
-//        assertTrue( startElement.isEnabled() );
-//        assertTrue( con1.isEnabled() );
-//        assertTrue( requestElement.isEnabled() );
-//        assertTrue( con2.isEnabled() );
-//        assertFalse( actionElement.isEnabled() );
-//        assertTrue( con3.isEnabled() );
-//        assertTrue( stopElement.isEnabled() );
-//        
-//        con2.setEnabled( true );
-//        assertTrue( startElement.isEnabled() );
-//        assertTrue( con1.isEnabled() );
-//        assertTrue( requestElement.isEnabled() );
-//        assertTrue( con2.isEnabled() );
-//        assertTrue( actionElement.isEnabled() );
-//        assertTrue( con3.isEnabled() );
-//        assertTrue( stopElement.isEnabled() );
-//	}
-
 	@Test
     public void testDisableTMLADActionState() {
         final CDElement element = new TMLADActionState( 500, 500, 0, 1400, 0, 1900, true, null, diagramPanel );