Fixing Policheck and test errors