Work on edit views & tests