Update ALL tests
JC-1737 Update methods