minor changes, add test