Move test files into correct dir

@fjvallarino please review