gem
fix namespacing; remove unneeded gems; additional tests