Quick fix, a few test still missing, and the remove method is not working corretly