add new test and clean up