Update APIs, closer to working unit test

Change-Id: If9ac0b26f311ec99b65fbbe1bd9aa494fcc92b48