0xbbjoker: Modified 12 files with 2 commits, focusing on tests work and other tasks, resulting in a net reduction of 136 lines of code.