Tests again FrodoTest are now more stringent
Cleaned up config tests in similar fashion.
Cleaned up the rest of in similar fashion.
Removed rest of MagicMock
Merge branch 'master' of https://github.com/mtford90/frodo