Tests updated and fixed.