Some Unit Tests done, delete tests still need to be done