contacts & tests
little refactoring