Fix fluent and updated test project