Added some notices and some tests
Added some notices and some tests