unit tests updated to latest changes in form