Fix bugs and add test mentor :)