move back to single file system and conditionally include file in tests