preparation for testing the (re-)integrated AAI; started strictly separating... See merge request !224