Added new Test and Change test to not use Deprecated code