test cleanup

* remove unused methods
* fix formatting
* delete entries owt we will randomly blow up
3 files changed