Added contacts, refactored tests to use less literals