Test packages now follows new convention

	Reviewed by: Simon