adding aif support
Extending aif tests