Replace sleeps with loop_untils
Started cleanup of test that data moves
Use variables instead of hardcoded table name / database name / data