Simplify mock builder.
Minor cleanup in test