fixing details such that full test suite runs again