Add missing constraints
	Fix unit tests