Tests rewritten completely to promote decoupling between them as well
as descriptions for each one.