Add Multiple fieldset case, refactor, add test - currently failing