Added form to demo & make basic test work