Split test_rebuild() into two tests

The method tests rebuilds with and without passwords, but the tests are
independent and should be in two seperate tests.

Also, remove duplication of the rebuild with password test from
test_rebuild_preserve_ephemeral

Change-Id: I40d0376fabf319dbe703d593de8fb4cdcf0aeab1