Testing and changes after Allison review