Added tests ...
Added tests (master)