Fix edit; get tests passing