[PATCH] mock statedir fixes