Reorganize includes by page
Move test code out of _include