added testling support