Expanded test coverage.
Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop