testsystem fixed and cleaned
cleaned up