Make numberOfSections a variable
Remove old tests, add form test