added form storage tests and fixes