wip: draft corrections + first test files