Fix object graph test to create AOs in a more standard way