some changes to work with autobahn test