Fixes in rebuild and change password

* No more fixture passing

Change-Id: I34f0c2e0227dd6004e738be733b2dac01901f4ca
Merge "Fixes in rebuild and change password"