Add more tests to support future refactoring and improved quality
Add more tests to support future refactoring and improved quality