Gets rid of empty fields test stub.
Standardizes the form class organization.