Tests updated, more verbose now;