Suggested fix to broken attr behaviour
	Fixed tests