adapt tests to changed interface
disable broken test temporarily