cleanup, add test