refactor tests and add contact page