Test of some stuff not well covered by the UI tests, and changes based on the tests.
Merge pull request #86 from alxdarksage/develop

Test of some stuff not well covered by the UI tests, and changes based o...