Getting tests working again. Removing more fluent interfaces.

Removing more fluent interfaces to make it easier to decorate
classes.