Refactored the mockaddressbook repository and clean up.