WIP: more fixes for tests and migrating to factories - focused on funding/donations