Updated code to remove new deprecations Updated code to fix compilation errors. Updated code to add new bits for tests