adapt tests to changed handler