Full implementation and tests for paragraph 1.1.4