extend testing, cleanup