Adds moar tests, refactors moar source to be coolio - bring moar beer...