Fixed broken tests due to exception message reformatting