Few fixes and cleanup around donations + prepare billing test snapshot