Fixing up the Gems and bundling
Tests complete