latest changes
removed needless test