M: TestFramework made public for another projects.
M: Some changes.