Added tests draft