Adding test support.