tests added and new include feature