Tidying tests

Improved some unit tests.  The only non-test change is a small guard in DictionaryManagerController.jav