Switched back to doing cleaning out of old records in -cleanup-db and added cleanup of test_rundat and test_steps tables.