Added tests + more