improving test architecture
need to fix the include/exclude logic and the getSeries