Use even simpler notation
Add few more tests