Update tests on wallet and circle
Merge fix