clean up debug statements, update test targets