adding FormSerializer, reorganizing tests