Refactored new and edit into common template
Made tests use :expect syntax instead of :should for non=integration tests