Last working state.
This commit includes also non-functional test classes!