Increase use of stubs for faster tests