clean up and additional test