APOLLO-3888 Implemented non-case contact
APOLLO-3003 Missing tests in attorney