add form tests + numerous other adjustments
remove garbage