Fixed broken tests
Release 5.1.1