tiny clean up and more test