Moved some non-db test functions to the non-db section.