Removed seeding before each tests
Added caching and includes filter