Fix test and sample type change
Merge pull request #32 from erwinwinder/master

	 Fix test and sample type change