Improve edit test class