Fixing tests, removing unused stuff.