refactor Rename some tests

Also fix a minor issue with MaximizableDialogTest which had template test env set incorrectly.