fix tests. remove old cases. remove tests of unused methods