more aetests, found some bugs