Make demo use form from tests
Merge branch 'release/4.0.4'