updating gem namespacing, fixing tests