tests updated (not everything done)