Updated policies
Added tests