Moved testcode
Removed tools