Unified plugin back into main gem;
Simplify tests