- minor code enhanecements
- added embedded containers for tests