AMS update was sufficient to fix AOPTest