added deleted method + test, reorganized tests