Remove unused method and test.
Add missing fixture back in.