Test cleanup

Dropped obsolete or problematic tests, let's start fresh