cleanup and update test