Add working index and form pages; Add tests