Modify fluent tests so they run, now that statics are removed