updated tests for Gen;
removed Enum from all batteries packs