Solving nested form issues, all specs passing