Fixed failing unit tests.
Fixed recursion loop in fluent interface.