Added getRanged and changed som tests