Unit test updates & fixes

Remove deprecated test
Update method signature(s) for additional params
Fix changed config key