remove last quickfix. improve the testsetup