Fixed delete and delete bugs, added some tests for that
Moved from using BaseTableTypes to using Columns