Add tests for edit, still need to troubleshoot...