Fix lint
Fix lint
Remove dead tests