Some form tests and improvments.