Test of some stuff not well covered by the UI tests, and changes based on the tests.
Should be in git but is not for some reason.
These need to change to fix the build