Tests added

Yep :) the less we pollute the global namespace, the better.