Add more tests
Simplify
Ignore