Database Migration Tests
Refactor contact mode to contact method
More DB test migration work