Correct errors on unittest and remove unnecessary samples