Added defintiion of tests 17 and 18