fix: Prune tests, clean up code (#337)

* fix: It's the final clean-up

* fix: It's the final clean-up 2

* fix: It's the final clean-up 3

* fix: Typo

* fix: It's the final clean-up 4

* fix: It's the final clean-up 5

* fix: It's the final clean-up 6

* fix: It's the final clean-up 7

Author: tmathern