Tests updated for current status.