Fix fluent tests - part 1
reorganize test files