Adding tests (round 1)