Fix more fixes. Remove dead tests, cleanup.