Add more test coverage
Make "_verify_includes()" actually work