Avoid stashing for simplicity and size
Add test cases