Eliminate repetition of test and add contact page