tests updated

	Still issues with everything
	#JustWebstormThings

	Commit by: Simon, Robert, Thomas