Move TestConsultation to test folder.
Merge github/master