adds contacts list test and method
Adds list contact test and merges master
Fixes merge issues