FT test succeeds, next step refactor