Testing and cleanup