#694 Fixed broken tests