Level 1 corrections + tests