Currently, the test suite does not follow the standard practice of mirroring the source code structure. We should do that.