fixing tests after changes in 1c7f086