Added tests support