Use less stubbing

Signed-off-by: Phan Le <ple@pivotallabs.com>