Added tests
Update sample