added test support