Adapt tests accordingly
Test Runner moved in new package
Inner class extracting
Adapt Aspects