Merge "Junit for AafRequestWrapper"