NZ-1 Preliminary changes to testing app