Update test to handle cleanup of tables created during testing