Transfer tests and test refactoring
Merge pull request #2151 from dimagi/no-tears-shampoo

Transfer tests