NZ-1 Preliminary changes to testing app
Merge pull request #59 from KurzonDax/dev

NZ-1 Preliminary changes to testing app