Final commit - full code integratation with test-suite branch