Tidied up and refactored yesterday's work.
Improved choice running example for unit testing
Added N/I, N/S processing unit test
Simplified timestamps for N/I test
Refactored last 2 tests to use common base class