reorganize test, start test for persistence