clean up and work out test