Add contact scaffold and extend tests