DELTASPIKE-288 folder-only tests and improvements