Add some test support