No problem, afterwards would you mind if we move both clienttest_main and integration_test_main into the unittest folder?