working test and clean up