Add Entry Disc Factory and its tests