Added more tests
Added delete toggle tests. Some misc changes.