Bug fixes
Add test item
simplify