master
Added some tests