DOS lineendings removed
merged
Testsystem configuration deleted
Adapted to new Framework