further fixes
use feedback information for unit tests