added tests
Easier to use syntax
support for old syntx
new package