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
Merge pull request #87 from alxdarksage/develop

Fixing build with files that seem to have disappeared in git