Gems added for CoreOS test, some further mods