Add tests to make sure new changes work
Add tests to make sure new changes work