Improve overall test coverage for this repo. We can split this issue up into multiple smaller issues as well.