Updating unittests to reflect changes in blockstorage version sync

Change-Id: I947f9a5e774bc65235127da7a4307db75e87a0b9
Merge "Updating unittests to reflect changes in blockstorage version sync"