Remove mock and stub style doubles.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Add specs for the removed aliases.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>