new tests
add delete
minor additional
some split