Oops, adding the untracked custom_func tests from last commit. Also, wrapping my mass updates in transactions to hopefully speed them up