Adding test support.
Adding test support.