Fix tests and conv sillyness