make tests pass

Change-Id: If9726db14c001c68531be37d3bab30d32049daea
docs

Change-Id: I87b3f9eb4da06848f8f932be868db78b29b827f3