adapt tests to removal of issues