Adding test support