Move/delete old tests that change behavior