Made includes easier to use, separated their tests from the crud tests