FluentTrait and tests added