merge fADtest to master