Removed failing tests. Now time for cleanup.