Update deprecated test
Remove unused test
Fix broken tests by #123