More work on unit tests for dialogs