Improve code coverage for aaf aaf modules