#316 progress with welcome screen.
#316 tests re-aligned