Roll forward backups and test cases

Change-Id: I51024a2b5bd232aea580fe8ca3d52a0a93a2c07b
Signed-off-by: Thomas Kee <xsited@yahoo.com>