ASE and test fix