edit view fix, test refactor