some changes for testing; add utility for clearing database per-user