Fixed & Updated Tests