removed obsolete tests, fixed some tests