Fix/container props and test improvements#10

guynikan merged 8 commits intomainguynikan/schepta:mainfrom

fix/container-props-and-test-improvementsguynikan/schepta:fix/container-props-and-test-improvementsCopy head branch name to clipboard