#453 fixed issue with failing tests post master merge