Refactoring Dictionary Test

Will move on from this, more complex features and integration will go in
separate files.