case 6 added
case 5 added
case 4 added
case 3 added
removed old tests