Index: src/Parser/unittests/Makefile.am
===================================================================
--- src/Parser/unittests/Makefile.am	(revision 045228296354cf9a1a142117a133f65dcf93f505)
+++ src/Parser/unittests/Makefile.am	(revision ed8a681ca27b0d36de905a8f9970d3a5cffa0bb2)
@@ -10,5 +10,4 @@
 	../Parser/unittests/ParserPsi3UnitTest.cpp \
 	../Parser/unittests/ParserTremoloUnitTest.cpp \
-	../Parser/unittests/ParserTremolo_ElementKeysUnitTest.cpp \
 	../Parser/unittests/ParserXmlUnitTest.cpp \
 	../Parser/unittests/ParserXyzUnitTest.cpp
@@ -20,5 +19,4 @@
 	../Parser/unittests/ParserPsi3UnitTest.hpp \
 	../Parser/unittests/ParserTremoloUnitTest.hpp \
-	../Parser/unittests/ParserTremolo_ElementKeysUnitTest.hpp \
 	../Parser/unittests/ParserXmlUnitTest.hpp \
 	../Parser/unittests/ParserXyzUnitTest.hpp
@@ -30,5 +28,4 @@
   ParserPsi3UnitTest \
   ParserTremoloUnitTest \
-  ParserTremolo_ElementKeysUnitTest \
   ParserXmlUnitTest \
   ParserXyzUnitTest
@@ -77,9 +74,4 @@
 ParserTremoloUnitTest_LDADD = ${PARSERLIBS}
 
-ParserTremolo_ElementKeysUnitTest_SOURCES = \
-	../Parser/unittests/ParserTremolo_ElementKeysUnitTest.cpp \
-	../Parser/unittests/ParserTremolo_ElementKeysUnitTest.hpp
-ParserTremolo_ElementKeysUnitTest_LDADD = ${PARSERLIBS}
-
 ParserXmlUnitTest_SOURCES = \
 	../Parser/unittests/ParserXmlUnitTest.cpp \
Index: src/Parser/unittests/ParserTremoloUnitTest.cpp
===================================================================
--- src/Parser/unittests/ParserTremoloUnitTest.cpp	(revision 045228296354cf9a1a142117a133f65dcf93f505)
+++ src/Parser/unittests/ParserTremoloUnitTest.cpp	(revision ed8a681ca27b0d36de905a8f9970d3a5cffa0bb2)
@@ -47,4 +47,5 @@
 #include "Element/element.hpp"
 #include "Element/periodentafel.hpp"
+#include "Parser/Exceptions.hpp"
 #include "Parser/TremoloParser.hpp"
 #include "Parser/ChangeTracker.hpp"
Index: src/Parser/unittests/ParserTremolo_ElementKeysUnitTest.cpp
===================================================================
--- src/Parser/unittests/ParserTremolo_ElementKeysUnitTest.cpp	(revision 045228296354cf9a1a142117a133f65dcf93f505)
+++ 	(revision )
@@ -1,89 +1,0 @@
-/*
- * Project: MoleCuilder
- * Description: creates and alters molecular systems
- * Copyright (C)  2010-2012 University of Bonn. All rights reserved.
- * 
- *
- *   This file is part of MoleCuilder.
- *
- *    MoleCuilder is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    MoleCuilder is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with MoleCuilder.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * ParserTremolo_ElementKeysUnitTest.cpp
- *
- *  Created on: Mar 3, 2010
- *      Author: metzler
- */
-
-// include config.h
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "ParserTremolo_ElementKeysUnitTest.hpp"
-
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-#include "Atom/atom.hpp"
-#include "Descriptors/AtomTypeDescriptor.hpp"
-#include "Element/element.hpp"
-#include "Element/periodentafel.hpp"
-#include "Parser/TremoloParser.hpp"
-#include "Parser/TremoloParser_ElementKeys.hpp"
-#include "Parser/ChangeTracker.hpp"
-#include "Potentials/Particles/ParticleRegistry.hpp"
-#include "World.hpp"
-#include "WorldTime.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
-
-using namespace std;
-
-// Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION( ParserTremolo_ElementKeysUnitTest );
-void ParserTremolo_ElementKeysUnitTest::setUp()
-{
-  knownTypes = new ElementKeys();
-}
-
-void ParserTremolo_ElementKeysUnitTest::tearDown()
-{
-  ParticleRegistry::purgeInstance();
-  WorldTime::purgeInstance();
-  World::purgeInstance();
-
-  delete knownTypes;
-}
-
-/************************************ tests ***********************************/
-
-void ParserTremolo_ElementKeysUnitTest::settergetterTest()
-{
-  // install a key
-  CPPUNIT_ASSERT_NO_THROW( knownTypes->setType("H1", "H"));
-
-  // check for excepetion
-  CPPUNIT_ASSERT_THROW( knownTypes->setType("H1", "H"), IllegalParserKeyException);
-
-  // get present key
-  CPPUNIT_ASSERT_NO_THROW( knownTypes->getType("H1"));
-
-  // get non-present key
-  CPPUNIT_ASSERT_THROW( knownTypes->getType("F"), IllegalParserKeyException);
-}
Index: src/Parser/unittests/ParserTremolo_ElementKeysUnitTest.hpp
===================================================================
--- src/Parser/unittests/ParserTremolo_ElementKeysUnitTest.hpp	(revision 045228296354cf9a1a142117a133f65dcf93f505)
+++ 	(revision )
@@ -1,38 +1,0 @@
-/*
- * ParserTremolo_ElementKeysUnitTest.hpp
- *
- *  Created on: Mar 12, 2012
- *      Author: heber
- */
-#ifndef PARSERTREMOLO_ELEMENTKEYS_UNITTEST_HPP_
-#define PARSERTREMOLO_ELEMENTKEYS_UNITTEST_HPP_
-
-// include config.h
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "Parser/TremoloParser.hpp"
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <string>
-
-struct ElementKeys;
-
-class ParserTremolo_ElementKeysUnitTest :  public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( ParserTremolo_ElementKeysUnitTest ) ;
-  CPPUNIT_TEST ( settergetterTest );
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void settergetterTest();
-
-private:
-  ElementKeys *knownTypes;
-};
-
-#endif /* PARSERTREMOLO_ELEMENTKEYS_UNITTEST_HPP_ */
