Integrated testem & improve/fix tests.