Add Ace functionality. Change unit test to reflect.