Removed code unused
Created more tests