Fix tests from recent db changes