remove all old tests
add new tests
fixes prompted by tests