Update unit tests for refactored architecture

Change-Id: I04639db977c515e5e1090ef8f0e1ce858820cb03
12 files changed