Reverted author to associated provider and fixed new tests

Change-Id: I757751fa26794efb42239ac3528fee7ef1f0b730
Signed-off-by: Jeremy Ho <jujaga@gmail.com>