Migration to simple forms and associated refactoring
Adding resource tests