Merge "Add tests for AaiServiceImpl"