Removed file generation stub from generator, added missing tests