Add support for testling