Fix tests

Fixed unit tests including "deprecated methods" errors. expect(this_fix)to.