Updated Tests and Functions