Added tests from 6 to 8. 4 Still in red [r]