Add more commented tests
Fix