Change Strength model to match safe.js
Fix test for the changes