adding test support