Small refactorings with minor API changes. Increased test coverage
Small refactorings with minor API changes. Increased test coverage

yaronyam/mbassador,bgroenks96/mbassador,bennidi/mbassador,bgroenks96/mbassador,yaronyam/mbassador,bennidi/mbassador