Add Contact static page
Improve test functionality