Fix test and finish refactor to flint