Tests updated again