Organized tests better, Added more KCTEST-918 variations