Clean up and add Moq lib.