some constructs adjusted, tests finished