improves test and adds some suggestsions
removes safety feature