✅ Improve test coverage

[ZeroEkkusu]

Issue

I've found tests to be less reliable when modifying code after a long time, because some functions are not covered enough. This requires manual checking to make sure everything works.

Open for anyone to take, or I'll do it later.