Review and adjust tests from section 4.1.5
Review and rework for tests in section 4.1.6
fixing color comments