some more cleanup

- match name of test to name of implementation
- remove unused code
- fix formatting

+review REVIEW-5208