Adding test framework.
More cleaning.