Slightly improved syntax sugar
Cleaned up a little bit the tests