Improve test coverage

TEST TEST TEST WHAAAAAA