Added tests 17 and 20.