cleanup & more test