Restructure project
fullincremental and emptyincremental tests