Significant cleanup on tests. More Fluent.