Added tests & reset function