Revert^2 "fixing tests to match new abstraction"

8e4c0b7afb8f5f0c4a4641104460f1791afe3691

Change-Id: I9875d6f9c16f1406d0818164a98e790c2b101650
25 files changed