Adding LCH, smoothing out tests a bit