Tests for units 3, 4 and 6 updated