update and clean up tests