Added contact us, updated tests
add spork