Reworked Some eBags tests