Made Changes to Testing Class